diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 617a2cf..89cde20 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -13,18 +13,13 @@
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_CMD_BOOTI
-#define CONFIG_CMD_EDITENV
-#define CONFIG_CMD_SAVEENV
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT4
 #define CONFIG_CMD_EXT4_WRITE
+#define CONFIG_CMD_FDT
 
 #define CONFIG_REMAKE_ELF
 
@@ -45,7 +40,6 @@
 #define CONFIG_OF_LIBFDT
 
 #define CONFIG_BAUDRATE		115200
-#define CONFIG_BOOTDELAY	3
 
 #define CONFIG_VERSION_VARIABLE
 #undef	CONFIG_SHOW_BOOT_PROGRESS